Fix dist target to keep previous symlink format.

May be a cleaner fix which I'll let IanC do.

Signed-off-by: Steven Hand <steven@xensource.com>

diff --git a/linux-2.6-xen-sparse/arch/i386/Makefile b/linux-2.6-xen-sparse/arch/i386/Makefile
index d6d0f45999c9a1196093e9d65884a4b91b50edfa..07af557f9e4aad5897bf081664d95f4ad03e6470 100644 (file)
--- a/linux-2.6-xen-sparse/arch/i386/Makefile
+++ b/linux-2.6-xen-sparse/arch/i386/Makefile
@@ -125,7 +125,7 @@ vmlinuz: vmlinux
        $(Q)$(MAKE) $(build)=$(boot) $@
 
 install:
-       $(Q)$(MAKE) $(build)=$(boot) XENGUEST=$(XENGUEST) $@
+       $(Q)$(MAKE) $(build)=$(boot) $@
 else
 all: bzImage
 

diff --git a/linux-2.6-xen-sparse/arch/i386/boot-xen/Makefile b/linux-2.6-xen-sparse/arch/i386/boot-xen/Makefile
index bf15a77094212d8160dd6694069406d406338ade..da9f7614c4ca5d8999de713619e1be7fc7d93a74 100644 (file)
--- a/linux-2.6-xen-sparse/arch/i386/boot-xen/Makefile
+++ b/linux-2.6-xen-sparse/arch/i386/boot-xen/Makefile
@@ -12,10 +12,8 @@ INSTALL_ROOT := $(patsubst %/boot,%,$(INSTALL_PATH))
 XINSTALL_NAME ?= $(KERNELRELEASE)
 install:
        mkdir -p $(INSTALL_ROOT)/boot
-       ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
-       rm -f $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
        install -m0644 vmlinuz $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
        install -m0644 vmlinux $(INSTALL_ROOT)/boot/vmlinux-syms-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
        install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
        install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
-       ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
+       ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(shell cat ./localversion-xen)$(INSTALL_SUFFIX)

diff --git a/linux-2.6-xen-sparse/arch/x86_64/Makefile b/linux-2.6-xen-sparse/arch/x86_64/Makefile
index 055b315abb66a5418eed3f4d2acca08976435252..b45be59f02c9cfd3cf3865dbaa6b1e1bb36201c4 100644 (file)
--- a/linux-2.6-xen-sparse/arch/x86_64/Makefile
+++ b/linux-2.6-xen-sparse/arch/x86_64/Makefile
@@ -91,7 +91,7 @@ vmlinuz: vmlinux
        $(Q)$(MAKE) $(build)=$(boot) $@
 
 install:
-       $(Q)$(MAKE) $(build)=$(boot) XENGUEST=$(XENGUEST) $@
+       $(Q)$(MAKE) $(build)=$(boot) $@
 else
 #Default target when executing "make"
 all: bzImage